Change error return values in WikiPage::getSection() and setText() (fixes #116) #129
Conversation
Xymph
force-pushed
the
129-error-return-values
branch
2 times, most recently
from
2af8629 to
c1af34d
Compare
Xymph
force-pushed
the
129-error-return-values
branch
from
c1af34d to
d3e8e88
Compare
|
I went back and forth a bit on the changelog section header btw, hence the first pair of force-pushes. In the same section will be the error code change in |
Good call. By the way, that reminds me of a comment I read a while ago: "all changes are potentially breaking, including so-called "bug fixes", which are just breaking changes where we have made a judgement call that no one is likely to have been relying on the old behavior." (and, of course, the relevant xkcd 😄) |
Xymph
force-pushed
the
129-error-return-values
branch
2 times, most recently
from
eed4aff to
770b268
Compare
| #### Fixed | ||
|
|
||
| * Fixed one error return value in `WikiPage::setText()` ([#129]) | ||
|
|
There was a problem hiding this comment.
Aw, come on, don't make me feel bad for requesting these lines to be added in the first commit 😅 (Or at least, have the changelog update as a separate commit to either change.)
There was a problem hiding this comment.
No intention to do that, but I'm not sure what you're aiming for. Should I move the getSection changelog entry into the first commit with the code change, or split off something into a third commit? How? Figured something out. Hmm, that didn't work yet.
Ok, I give up, bedtime for me.
There was a problem hiding this comment.
Should I move the getSection changelog entry into the first commit with the code change, or split off something into a third commit?
Either should work. Probably having the changelog in a separate commit is easier, but here's how I'd do both:
git rebase -i master, change the first commit's line in the rebase editor frompicktoedit, and when the rebase pauses there, I'd make the change to the changelog and thengit commit --amend,git rebase --continue. Hopefully git would automatically detect the duplicated changes in the second commit and simply apply the difference.
or
git reset HEAD~(which I have aliased togit uncommit, btw) to undo the latest commit and leave its changes in the working directory, thengit add Wikimate.php, make the commit, and thengit add CHANGELOG.mdand make that commit.
Since you're gone and I've given you this trouble, let me see if I can do it myself.
There was a problem hiding this comment.
Ok, option 1 worked. Git was smart enough to finish the rebase cleanly for me :) I'll go ahead and merge. Once again, sorry for the trouble! 😅
Xymph
force-pushed
the
129-error-return-values
branch
4 times, most recently
from
b698485 to
ea2bfec
Compare
waldyrious
force-pushed
the
129-error-return-values
branch
from
ea2bfec to
f8f42ce
Compare
See issue #116.